From 64b3a9b57de15a154effcf4d9618936d252042da Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Wed, 16 Sep 2015 18:45:22 +0200 Subject: [PATCH] mw.widgets.DateInputWidget: Ensure newly opened calendar shows current selection CalendarWidget's #resetUI method was previously unused, it was clearly implemented for this purpose. Change-Id: I865a289b331d6163fb56f9e0ec3918cfd2b91343 --- resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js | 2 +- resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js index d519c0df54..19dfc9a8b8 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js @@ -427,7 +427,7 @@ * Reset the user interface of this widget to reflect selected date. */ mw.widgets.CalendarWidget.prototype.resetUI = function () { - this.moment = moment( this.getDate(), this.getDateFormat() ); + this.moment = this.getDate() !== null ? moment( this.getDate(), this.getDateFormat() ) : moment(); this.displayLayer = this.getDisplayLayers()[ 0 ]; this.updateUI(); }; diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js index b478c4a95c..657d9c540a 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js @@ -324,6 +324,7 @@ * @private */ mw.widgets.DateInputWidget.prototype.activate = function () { + this.calendar.resetUI(); this.$element.addClass( 'mw-widget-dateInputWidget-active' ); this.handle.toggle( false ); this.textInput.toggle( true ); -- 2.20.1